pin code fixes

3 files changed, 7 insertions, 13 deletions

diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js
index 039d4235..b4a1e941 100644
--- a/src/routes/(app)/[username]/request/+page.server.js
+++ b/src/routes/(app)/[username]/request/+page.server.js
@@ -1,15 +1,11 @@
 import { redirect } from '@sveltejs/kit';
 import { auth, post } from '$lib/utils';
 
-export let load = ({ locals }) => {
-	if (!locals.user) throw redirect(307, '/login');
-};
-
 export const actions = {
-	create: async ({ cookies, locals, request, url }) => {
+	create: async ({ cookies, request, url }) => {
 		let form = Object.fromEntries(await request.formData());
-		let { id } = await post('/requests', form, auth(cookies));
-		throw redirect(307, `/${locals.user.username}/request/${id}`);
+		let { id, requester } = await post('/requests', form, auth(cookies));
+		throw redirect(307, `/${requester.username}/request/${id}`);
 	},
 
 	delete: async ({ cookies, request }) => {
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index dcaa26b4..cb642e60 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -7,13 +7,9 @@ export function load({ params, url }) {
 }
 
 export const actions = {
-	default: async ({ cookies, locals, request }) => {
+	default: async ({ cookies, request }) => {
 		let form = Object.fromEntries(await request.formData());
-
-		let user = {
-			...locals.user,
-			...form
-		};
+		let user = { ...(await get('/me', auth(cookies))), ...form };
 
 		try {
 			({ user } = await post(`/user`, user, auth(cookies)));
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index f4c04329..2d880d44 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -19,6 +19,7 @@
 	let old;
 
 	let startVerifying = () => {
+    if (pinCode.join("").length < 6) return;
 		verifying = true;
 	};
 
@@ -80,6 +81,7 @@
 		if (user.haspin) {
 			try {
 				pin = null;
+        await tick();
 				submit.click();
 			} catch (e) {
 				console.log(e);